Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 06:52:01 +0000 (22:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 06:52:01 +0000 (22:52 -0800)

Trivial merge